Always use `ctx.Locale.Tr` inside templates #27231

delvh · 2023-09-24T15:46:32Z

Refactoring performed using

cd templates/
ag --only-matching --nofilename '[^{()\s]+\.Tr\b' | sed 's/ //g' | uniq --unique | sort -h | uniq --unique

 # Then pipe into vim, execute ':sort u', throw out `ctx.Locale.Tr`, and save as '../bad-instances'

for bad_instance in $(cat ../bad-instances); do
  echo $bad_instance;
  for file in $(ag --literal --files-with-matches "$bad_instance") ; do
    vim "$file" -c ":%s/\(\<\)\?$bad_instance\(\>\)\?/\1ctx.Locale.Tr\2" -c ':wq' ;
  done;
done

# Edge cases that are not covered by above
for file in $(ag --files-with-matches -Q '$ctx.Locale.Tr') ; do vim $file -c ':%s/\$ctx\.Locale\.Tr/ctx\.Locale\.Tr/g' -c ':wq'; done
git checkout da0467e3b -- ./status/500.tmpl
for file in $(ag --files-with-matches -Q '$.rootctx.Locale.Tr') ; do vim $file -c ':%sno/$.rootctx.Locale.Tr/ctx.Locale.Tr/g' -c ':wq'; done
for file in $(ag --files-with-matches -Q  '.rootctx.Locale.Tr') ; do vim $file -c ':%sno/.rootctx.Locale.Tr/ctx.Locale.Tr/g' -c ':wq'; done
for file in $(ag --files-with-matches -Q  '.ctxDatactx.Locale.Tr') ; do vim $file -c ':%sno/.ctxDatactx.Locale.Tr/ctx.Locale.Tr/g' -c ':wq'; done

This PR is a corollary to #27227 as that PR removes the unneeded locale parameters from subtemplates.

wxiaoguang · 2023-09-24T15:56:48Z

500.tmpl is special, it can't use ctx at the moment.

delvh · 2023-09-24T16:07:44Z

Done

templates/repo/branch_dropdown.tmpl

Refactoring performed using ```bash cd templates/ ag --only-matching --nofilename '[^{()\s]+\.Tr\b' | sed 's/ //g' | uniq --unique | sort -h | uniq --unique # Then pipe into vim, execute ':sort u', throw out `ctx.Locale.Tr`, and save as '../bad-instances' for bad_instance in $(cat ../bad-instances); do echo $bad_instance; for file in $(ag --literal --files-with-matches "$bad_instance") ; do vim "$file" -c ":%s/$\<$\?$bad_instance$\>$\?/\1ctx.Locale.Tr\2" -c ':wq' ; done; done # Edge cases that are not covered by above for file in $(ag --files-with-matches -Q '$ctx.Locale.Tr') ; do vim $file -c ':%s/\$ctx\.Locale\.Tr/ctx\.Locale\.Tr/g' -c ':wq'; done git checkout da0467e -- ./status/500.tmpl for file in $(ag --files-with-matches -Q '$.rootctx.Locale.Tr') ; do vim $file -c ':%sno/$.rootctx.Locale.Tr/ctx.Locale.Tr/g' -c ':wq'; done for file in $(ag --files-with-matches -Q '.rootctx.Locale.Tr') ; do vim $file -c ':%sno/.rootctx.Locale.Tr/ctx.Locale.Tr/g' -c ':wq'; done for file in $(ag --files-with-matches -Q '.ctxDatactx.Locale.Tr') ; do vim $file -c ':%sno/.ctxDatactx.Locale.Tr/ctx.Locale.Tr/g' -c ':wq'; done ```

denyskon

I didn't go through all files, but it looks good to me in general. I think we should merge, and fix possible issues when they appear. Thanks @delvh

delvh · 2023-09-24T17:28:26Z

Hmm… Is the current CI failure related to my changes or not?
I'm rather leaning towards unrelated.

denyskon · 2023-09-24T17:35:59Z

Looks related to me.... the few tests I looked at refer to some text inside pages, or http errors... looks like broken templates

delvh · 2023-09-24T17:38:27Z

Found the culprit.
Am currently fixing it.

delvh · 2023-09-24T19:49:41Z

Okay, now I am confused:
According to the CI, my changes appear to be responsible for the failure.
However, I cannot reproduce the 500 locally.
I cannot even find a template that is called by the respective method.
So, I have no idea what is going wrong here.
Does anyone else have an idea?

denyskon · 2023-09-24T20:18:07Z

@delvh It's the mail template under templates/mail/team_invite.tmpl.
It doesn't seem to work with ctx.Locale.Tr. When changing back to .locale.Tr, the tests pass

silverwind

lgtm after ci passes

GiteaBot · 2023-09-25T08:56:56Z

I was unable to create a backport for 1.21. @delvh, please send one manually. 🍵

go run ./contrib/backport 27231
...  // fix git conflicts if any
go run ./contrib/backport --continue

wxiaoguang · 2023-09-25T12:47:51Z

-> Backport ctx locale refactoring manually #27260

Backport #27231 #27259 manually --------- Co-authored-by: delvh <dev.lh@web.de>

* giteaofficial/main: [skip ci] Updated translations via Crowdin Another round of `db.DefaultContext` refactor (go-gitea#27103) Fix more "locale" usages (go-gitea#27259) Always use `ctx.Locale.Tr` inside templates (go-gitea#27231) Disable `Test Delivery` and `Replay` webhook buttons when webhook is inactive (go-gitea#27211) # Conflicts: # templates/base/footer_content.tmpl # templates/repo/issue/view_content/context_menu.tmpl

@delvh

Backport #27275 by @delvh Co-authored-by: delvh <dev.lh@web.de>

* giteaoffical/main: (22 commits) Fix review UI (go-gitea#27322) Improve issue history dialog and make poster can delete their own history (go-gitea#27323) Improve branch list UI (go-gitea#27319) doctor: delete action entries without existing user (go-gitea#27292) fix orphan check for deleted branch (go-gitea#27310) make writing main test easier (go-gitea#27270) [skip ci] Updated translations via Crowdin Fix protected branch icon location (go-gitea#26576) move the `gitea admin` subcommands into separate files (go-gitea#27307) Fix chinese translation (go-gitea#27296) bump bleve (go-gitea#27300) Redefine the meaning of column is_active to make Actions Registration Token generation easier (go-gitea#27143) Use vitest globals (go-gitea#27102) Fix divider in subscription page (go-gitea#27298) Fix yaml test (go-gitea#27297) Enable production source maps for index.js, fix CSS sourcemaps (go-gitea#27291) Fix some animation bugs (go-gitea#27287) Add missed return to actions view fetch (go-gitea#27289) Fix more yaml lint errors (go-gitea#27284) Fix incorrect change from go-gitea#27231 (go-gitea#27275) ...

delvh added topic/ui Change the appearance of the Gitea UI type/refactoring Existing code has been cleaned up. There should be no new functionality. labels Sep 24, 2023

delvh requested a review from denyskon September 24, 2023 15:46

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 24, 2023

pull-request-size bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 24, 2023

wxiaoguang reviewed Sep 24, 2023

View reviewed changes

templates/repo/branch_dropdown.tmpl Outdated Show resolved Hide resolved

delvh force-pushed the ctx-locale-tr-everywhere branch from 14c6b07 to 321fd35 Compare September 24, 2023 16:43

denyskon approved these changes Sep 24, 2023

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 24, 2023

denyskon self-requested a review September 24, 2023 17:29

GiteaBot added lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 24, 2023

delvh added 3 commits September 24, 2023 19:55

Fix both false positives and false negatives produced by the regex

10e2c76

Fix 500 on the repo homepage

a48ead2

Merge branch 'main' into ctx-locale-tr-everywhere

7ee755b

denyskon approved these changes Sep 24, 2023

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 24, 2023

delvh added 2 commits September 24, 2023 22:34

Try suggested fix by @denyskon

e96b5b5

Merge branch 'main' into ctx-locale-tr-everywhere

9f053b7

silverwind approved these changes Sep 24, 2023

View reviewed changes

GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 25, 2023

puni9869 approved these changes Sep 25, 2023

View reviewed changes

delvh added the backport/v1.21 This PR should be backported to Gitea 1.21 label Sep 25, 2023

Merge branch 'main' into ctx-locale-tr-everywhere

9ed1851

delvh added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. reviewed/prioritize-merge PR is in the merge queue. Merge as soon as possible, i.e. as edits by maintainers are not enabled labels Sep 25, 2023

techknowlogick merged commit 7960ba7 into go-gitea:main Sep 25, 2023
25 checks passed

GiteaBot added this to the 1.22.0 milestone Sep 25, 2023

wxiaoguang pushed a commit to wxiaoguang/gitea that referenced this pull request Sep 25, 2023

Always use ctx.Locale.Tr inside templates (go-gitea#27231)

9c7e94f

wxiaoguang mentioned this pull request Sep 25, 2023

Backport ctx locale refactoring manually (#27231) (#27259) #27260

Merged

wxiaoguang added a commit that referenced this pull request Sep 25, 2023

Backport ctx locale refactoring manually (#27231) (#27259) (#27260)

597b04f

Backport #27231 #27259 manually --------- Co-authored-by: delvh <dev.lh@web.de>

delvh deleted the ctx-locale-tr-everywhere branch September 25, 2023 14:56

delvh added a commit to delvh/gitea that referenced this pull request Sep 26, 2023

Fix incorrect change from go-gitea#27231

0b33bbf

wxiaoguang pushed a commit that referenced this pull request Sep 26, 2023

Fix incorrect change from #27231 (#27275)

1f89a45

GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 26, 2023

Fix incorrect change from go-gitea#27231 (go-gitea#27275)

e0307eb

lunny pushed a commit that referenced this pull request Sep 26, 2023

Fix incorrect change from #27231 (#27275) (#27282)

0abd78e

Backport #27275 by @delvh Co-authored-by: delvh <dev.lh@web.de>

kerwin612 added a commit to kerwin612/gitea that referenced this pull request Nov 3, 2023

Merge go-gitea#27231 changes

a566e3a

lng2020 added backport/done All backports for this PR have been created and removed backport/manual No power to the bots! Create your backport yourself! labels Nov 12, 2023

tyroneyeh mentioned this pull request Nov 14, 2023

Support multiple projects #27984

Open

wxiaoguang mentioned this pull request Nov 16, 2023

Cannot access custom locale keys in 1.21 #28081

Closed

go-gitea locked as resolved and limited conversation to collaborators Dec 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Always use `ctx.Locale.Tr` inside templates #27231

Always use `ctx.Locale.Tr` inside templates #27231

delvh commented Sep 24, 2023 •

edited

Loading

wxiaoguang commented Sep 24, 2023

delvh commented Sep 24, 2023

denyskon left a comment

delvh commented Sep 24, 2023

denyskon commented Sep 24, 2023

delvh commented Sep 24, 2023

delvh commented Sep 24, 2023

denyskon commented Sep 24, 2023

silverwind left a comment

GiteaBot commented Sep 25, 2023

wxiaoguang commented Sep 25, 2023

Always use ctx.Locale.Tr inside templates #27231

Always use ctx.Locale.Tr inside templates #27231

Conversation

delvh commented Sep 24, 2023 • edited Loading

wxiaoguang commented Sep 24, 2023

delvh commented Sep 24, 2023

denyskon left a comment

Choose a reason for hiding this comment

delvh commented Sep 24, 2023

denyskon commented Sep 24, 2023

delvh commented Sep 24, 2023

delvh commented Sep 24, 2023

denyskon commented Sep 24, 2023

silverwind left a comment

Choose a reason for hiding this comment

GiteaBot commented Sep 25, 2023

wxiaoguang commented Sep 25, 2023

Always use `ctx.Locale.Tr` inside templates #27231

Always use `ctx.Locale.Tr` inside templates #27231

delvh commented Sep 24, 2023 •

edited

Loading